xsm/flask: Fix AVC audit message format

Fix formatting of Flask AVC audit messages so that existing
policy tools can parse them.  After applying,
'xm dmesg | audit2allow' yields the expected result.

Signed-off-by: Stephen D. Smalley <sds@tycho.nsa.gov>
Signed-off-by: George S. Coker, II <gscoker@alpha.ncsc.mil>

diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c
index 218b20d4c404d9a2c647b109d9c40a4672f08910..5b4302157d990728670c1a54f4f36dd2cf01ef67 100644 (file)
--- a/xen/xsm/flask/avc.c
+++ b/xen/xsm/flask/avc.c
@@ -226,8 +226,8 @@ static void avc_dump_query(u32 ssid, u32 tsid, u16 tclass)
         printk(" tcontext=%s", scontext);
         xfree(scontext);
     }
-    printk("\n");
-    printk("tclass=%s", class_to_string[tclass]);
+
+    printk(" tclass=%s", class_to_string[tclass]);
 }
 
 /**
@@ -560,12 +560,10 @@ void avc_audit(u32 ssid, u32 tsid, u16 tclass, u32 requested,
     if ( a && a->d )
         d = a->d;
     if ( d )
-        printk("domid=%d", d->domain_id);
+        printk("domid=%d ", d->domain_id);
 
-    printk("\n");
     avc_dump_query(ssid, tsid, tclass);
     printk("\n");
-
 }
 
 /**